Description of changes

• Added missing metrics from the ContainerInsights dashboard not included in the agent's solution for JMX.
  • Compared the current spec files for JVM and Tomcat with the dashboard to see what was missing.
  • Set up an EC2 cluster, a Tomcat application, and JMXTerm to find the bean and metric names for the missing metrics.
  • Added these to the spec file based on appropriate types and the naming convention from OTel.
  • Then, the ADOT Jar image was built and tested with the amazon-cloudwatch-agent-operator and helm-charts on an EKS cluster with a custom Tomcat deployment, which correctly produced the correct metrics:
    • ./scripts/local_patch.sh && ./gradlew build
    • docker build --platform linux/amd64 -t adot-autoinstrumentation-java .
    • [add docker image to ECR]

Manual testing

For testing, I decided to use this built image with the CloudWatch Agent to see if these metrics are able to be emitted and tracked on the CW console.

Configuration

    {
      "metrics": {
        "namespace": "tomcat",
        "metrics_collected": {
          "jmx": {
            "jvm": {
              "measurement": [
                "jvm.system.swap.space.total",
                "jvm.system.swap.space.free",
                "jvm.system.physical.memory.total",
                "jvm.system.physical.memory.free",
                "jvm.system.available.processors",
                "jvm.system.cpu.utilization",
                "jvm.open_file_descriptor.count",
                "jvm.daemon_threads.count",
                "jvm.threads.count"
              ]
            },
            "tomcat": {
              "measurement": [
                "tomcat.rejected_sessions",
                "tomcat.sessions"
              ]
            }
          }
        }
      }
    }

CW Console

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.